diff --git a/reactos/modules/directory.rbuild b/reactos/modules/directory.rbuild
index a4660804b66..c1ce9f37073 100644
--- a/reactos/modules/directory.rbuild
+++ b/reactos/modules/directory.rbuild
@@ -27,6 +27,13 @@
 			</xi:fallback>
 		</xi:include>
 	</directory>
+	<directory name="rostests">
+		<xi:include href="rostests/directory.rbuild">
+			<xi:fallback>
+				<xi:include href="empty.rbuild" />
+			</xi:fallback>
+		</xi:include>
+	</directory>
 	<directory name="vms">
 		<xi:include href="vms/directory.rbuild">
 			<xi:fallback>
diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild
index 078d4590cea..a5e413ec31c 100644
--- a/rosapps/directory.rbuild
+++ b/rosapps/directory.rbuild
@@ -13,9 +13,6 @@
 <directory name="dflat32">
 	<xi:include href="dflat32/dflat32.rbuild" />
 </directory>
-<directory name="dxtest">
-	<xi:include href="dxtest/directory.rbuild" />
-</directory>
 <!--
 <directory name="lib">
 	<xi:include href="lib/directory.rbuild" />
@@ -46,8 +43,5 @@
 <directory name="templates">
 	<xi:include href="templates/directory.rbuild" />
 </directory>
-<directory name="tests">
-	<xi:include href="tests/directory.rbuild" />
-</directory>
 
 
diff --git a/rosapps/dxtest/ddraw/.gitignore b/rosapps/dxtest/ddraw/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/rosapps/dxtest/gdi32/.gitignore b/rosapps/dxtest/gdi32/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/rostests/copying b/rostests/copying
new file mode 100644
index 00000000000..dc63aaca038
--- /dev/null
+++ b/rostests/copying
@@ -0,0 +1,340 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/rostests/directory.rbuild b/rostests/directory.rbuild
new file mode 100644
index 00000000000..2cf2d77b7d6
--- /dev/null
+++ b/rostests/directory.rbuild
@@ -0,0 +1,6 @@
+<directory name="dxtest">
+	<xi:include href="dxtest/directory.rbuild" />
+</directory>
+<directory name="tests">
+	<xi:include href="tests/directory.rbuild" />
+</directory>
diff --git a/rosapps/dxtest/directory.rbuild b/rostests/dxtest/directory.rbuild
similarity index 100%
rename from rosapps/dxtest/directory.rbuild
rename to rostests/dxtest/directory.rbuild
diff --git a/rosapps/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c b/rostests/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c
similarity index 100%
rename from rosapps/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c
rename to rostests/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c
diff --git a/rosapps/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c b/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c
similarity index 100%
rename from rosapps/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c
rename to rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c
diff --git a/rosapps/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c b/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c
similarity index 100%
rename from rosapps/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c
rename to rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c
diff --git a/rosapps/dxtest/win32kdxtest/dump.c b/rostests/dxtest/win32kdxtest/dump.c
similarity index 100%
rename from rosapps/dxtest/win32kdxtest/dump.c
rename to rostests/dxtest/win32kdxtest/dump.c
diff --git a/rosapps/dxtest/win32kdxtest/main.c b/rostests/dxtest/win32kdxtest/main.c
similarity index 100%
rename from rosapps/dxtest/win32kdxtest/main.c
rename to rostests/dxtest/win32kdxtest/main.c
diff --git a/rosapps/dxtest/win32kdxtest/test.h b/rostests/dxtest/win32kdxtest/test.h
similarity index 100%
rename from rosapps/dxtest/win32kdxtest/test.h
rename to rostests/dxtest/win32kdxtest/test.h
diff --git a/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild b/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild
similarity index 100%
rename from rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild
rename to rostests/dxtest/win32kdxtest/win32kdxtest.rbuild
diff --git a/rostests/readme.txt b/rostests/readme.txt
new file mode 100644
index 00000000000..2b10c84a0ff
--- /dev/null
+++ b/rostests/readme.txt
@@ -0,0 +1,9 @@
+$Id: readme.txt 21229 2006-03-05 13:57:35Z frik85 $
+
+====================
+ReactOS Tests
+====================
+
+This directory contains various tests for ReactOS.
+Make sure you also have a copy of the rest of the ReactOS
+source before you attempt to build anything in this module.
\ No newline at end of file
diff --git a/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
similarity index 100%
rename from rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
rename to rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
diff --git a/rosapps/tests/D3DParseUnknownCommand_show/main.c b/rostests/tests/D3DParseUnknownCommand_show/main.c
similarity index 100%
rename from rosapps/tests/D3DParseUnknownCommand_show/main.c
rename to rostests/tests/D3DParseUnknownCommand_show/main.c
diff --git a/rosapps/tests/DxHalTest/DxHalTest.rbuild b/rostests/tests/DxHalTest/DxHalTest.rbuild
similarity index 100%
rename from rosapps/tests/DxHalTest/DxHalTest.rbuild
rename to rostests/tests/DxHalTest/DxHalTest.rbuild
diff --git a/rosapps/tests/DxHalTest/main.c b/rostests/tests/DxHalTest/main.c
similarity index 100%
rename from rosapps/tests/DxHalTest/main.c
rename to rostests/tests/DxHalTest/main.c
diff --git a/rosapps/tests/DxHalTest/main.h b/rostests/tests/DxHalTest/main.h
similarity index 100%
rename from rosapps/tests/DxHalTest/main.h
rename to rostests/tests/DxHalTest/main.h
diff --git a/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild b/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
similarity index 100%
rename from rosapps/tests/Imagelistviewer/imagelistviewer.rbuild
rename to rostests/tests/Imagelistviewer/imagelistviewer.rbuild
diff --git a/rosapps/tests/Imagelistviewer/main.c b/rostests/tests/Imagelistviewer/main.c
similarity index 100%
rename from rosapps/tests/Imagelistviewer/main.c
rename to rostests/tests/Imagelistviewer/main.c
diff --git a/rosapps/tests/Imagelistviewer/res.rc b/rostests/tests/Imagelistviewer/res.rc
similarity index 100%
rename from rosapps/tests/Imagelistviewer/res.rc
rename to rostests/tests/Imagelistviewer/res.rc
diff --git a/rosapps/tests/Imagelistviewer/resource.h b/rostests/tests/Imagelistviewer/resource.h
similarity index 100%
rename from rosapps/tests/Imagelistviewer/resource.h
rename to rostests/tests/Imagelistviewer/resource.h
diff --git a/rosapps/tests/README.txt b/rostests/tests/README.txt
similarity index 100%
rename from rosapps/tests/README.txt
rename to rostests/tests/README.txt
diff --git a/rosapps/tests/accelerator/accelerator.c b/rostests/tests/accelerator/accelerator.c
similarity index 100%
rename from rosapps/tests/accelerator/accelerator.c
rename to rostests/tests/accelerator/accelerator.c
diff --git a/rosapps/tests/accelerator/accelerator.rbuild b/rostests/tests/accelerator/accelerator.rbuild
similarity index 100%
rename from rosapps/tests/accelerator/accelerator.rbuild
rename to rostests/tests/accelerator/accelerator.rbuild
diff --git a/rosapps/tests/alive/alive.c b/rostests/tests/alive/alive.c
similarity index 100%
rename from rosapps/tests/alive/alive.c
rename to rostests/tests/alive/alive.c
diff --git a/rosapps/tests/alive/alive.rbuild b/rostests/tests/alive/alive.rbuild
similarity index 100%
rename from rosapps/tests/alive/alive.rbuild
rename to rostests/tests/alive/alive.rbuild
diff --git a/rosapps/tests/alphablend/alphablend.c b/rostests/tests/alphablend/alphablend.c
similarity index 100%
rename from rosapps/tests/alphablend/alphablend.c
rename to rostests/tests/alphablend/alphablend.c
diff --git a/rosapps/tests/alphablend/alphablend.rbuild b/rostests/tests/alphablend/alphablend.rbuild
similarity index 100%
rename from rosapps/tests/alphablend/alphablend.rbuild
rename to rostests/tests/alphablend/alphablend.rbuild
diff --git a/rosapps/tests/alphablend/alphablend.rc b/rostests/tests/alphablend/alphablend.rc
similarity index 100%
rename from rosapps/tests/alphablend/alphablend.rc
rename to rostests/tests/alphablend/alphablend.rc
diff --git a/rosapps/tests/alphablend/lena.bmp b/rostests/tests/alphablend/lena.bmp
similarity index 100%
rename from rosapps/tests/alphablend/lena.bmp
rename to rostests/tests/alphablend/lena.bmp
diff --git a/rosapps/tests/alphablend/lenaalpha.bmp b/rostests/tests/alphablend/lenaalpha.bmp
similarity index 100%
rename from rosapps/tests/alphablend/lenaalpha.bmp
rename to rostests/tests/alphablend/lenaalpha.bmp
diff --git a/rosapps/tests/apc/apc.c b/rostests/tests/apc/apc.c
similarity index 100%
rename from rosapps/tests/apc/apc.c
rename to rostests/tests/apc/apc.c
diff --git a/rosapps/tests/apc/apc.rbuild b/rostests/tests/apc/apc.rbuild
similarity index 100%
rename from rosapps/tests/apc/apc.rbuild
rename to rostests/tests/apc/apc.rbuild
diff --git a/rosapps/tests/apc2/apc2.c b/rostests/tests/apc2/apc2.c
similarity index 100%
rename from rosapps/tests/apc2/apc2.c
rename to rostests/tests/apc2/apc2.c
diff --git a/rosapps/tests/apc2/apc2.rbuild b/rostests/tests/apc2/apc2.rbuild
similarity index 100%
rename from rosapps/tests/apc2/apc2.rbuild
rename to rostests/tests/apc2/apc2.rbuild
diff --git a/rosapps/tests/args/args.c b/rostests/tests/args/args.c
similarity index 100%
rename from rosapps/tests/args/args.c
rename to rostests/tests/args/args.c
diff --git a/rosapps/tests/args/args.rbuild b/rostests/tests/args/args.rbuild
similarity index 100%
rename from rosapps/tests/args/args.rbuild
rename to rostests/tests/args/args.rbuild
diff --git a/rosapps/tests/atomtest/atomtest.c b/rostests/tests/atomtest/atomtest.c
similarity index 100%
rename from rosapps/tests/atomtest/atomtest.c
rename to rostests/tests/atomtest/atomtest.c
diff --git a/rosapps/tests/atomtest/atomtest.rbuild b/rostests/tests/atomtest/atomtest.rbuild
similarity index 100%
rename from rosapps/tests/atomtest/atomtest.rbuild
rename to rostests/tests/atomtest/atomtest.rbuild
diff --git a/rosapps/tests/bench/bench-syscall.c b/rostests/tests/bench/bench-syscall.c
similarity index 100%
rename from rosapps/tests/bench/bench-syscall.c
rename to rostests/tests/bench/bench-syscall.c
diff --git a/rosapps/tests/bench/bench-thread.c b/rostests/tests/bench/bench-thread.c
similarity index 100%
rename from rosapps/tests/bench/bench-thread.c
rename to rostests/tests/bench/bench-thread.c
diff --git a/rosapps/tests/bench/bench.rbuild b/rostests/tests/bench/bench.rbuild
similarity index 100%
rename from rosapps/tests/bench/bench.rbuild
rename to rostests/tests/bench/bench.rbuild
diff --git a/rosapps/tests/bitblt/bitblt.c b/rostests/tests/bitblt/bitblt.c
similarity index 100%
rename from rosapps/tests/bitblt/bitblt.c
rename to rostests/tests/bitblt/bitblt.c
diff --git a/rosapps/tests/bitblt/bitblt.rbuild b/rostests/tests/bitblt/bitblt.rbuild
similarity index 100%
rename from rosapps/tests/bitblt/bitblt.rbuild
rename to rostests/tests/bitblt/bitblt.rbuild
diff --git a/rosapps/tests/bitblt/bitblt.rc b/rostests/tests/bitblt/bitblt.rc
similarity index 100%
rename from rosapps/tests/bitblt/bitblt.rc
rename to rostests/tests/bitblt/bitblt.rc
diff --git a/rosapps/tests/bitblt/lena.bmp b/rostests/tests/bitblt/lena.bmp
similarity index 100%
rename from rosapps/tests/bitblt/lena.bmp
rename to rostests/tests/bitblt/lena.bmp
diff --git a/rosapps/tests/button/button.rbuild b/rostests/tests/button/button.rbuild
similarity index 100%
rename from rosapps/tests/button/button.rbuild
rename to rostests/tests/button/button.rbuild
diff --git a/rosapps/tests/button/buttontst.c b/rostests/tests/button/buttontst.c
similarity index 100%
rename from rosapps/tests/button/buttontst.c
rename to rostests/tests/button/buttontst.c
diff --git a/rosapps/tests/button2/button2.rbuild b/rostests/tests/button2/button2.rbuild
similarity index 100%
rename from rosapps/tests/button2/button2.rbuild
rename to rostests/tests/button2/button2.rbuild
diff --git a/rosapps/tests/button2/buttontst2.c b/rostests/tests/button2/buttontst2.c
similarity index 100%
rename from rosapps/tests/button2/buttontst2.c
rename to rostests/tests/button2/buttontst2.c
diff --git a/rosapps/tests/capclock/capclock.c b/rostests/tests/capclock/capclock.c
similarity index 100%
rename from rosapps/tests/capclock/capclock.c
rename to rostests/tests/capclock/capclock.c
diff --git a/rosapps/tests/capclock/capclock.ico b/rostests/tests/capclock/capclock.ico
similarity index 100%
rename from rosapps/tests/capclock/capclock.ico
rename to rostests/tests/capclock/capclock.ico
diff --git a/rosapps/tests/capclock/capclock.rbuild b/rostests/tests/capclock/capclock.rbuild
similarity index 100%
rename from rosapps/tests/capclock/capclock.rbuild
rename to rostests/tests/capclock/capclock.rbuild
diff --git a/rosapps/tests/capclock/capclock.rc b/rostests/tests/capclock/capclock.rc
similarity index 100%
rename from rosapps/tests/capclock/capclock.rc
rename to rostests/tests/capclock/capclock.rc
diff --git a/rosapps/tests/carets/caret.bmp b/rostests/tests/carets/caret.bmp
similarity index 100%
rename from rosapps/tests/carets/caret.bmp
rename to rostests/tests/carets/caret.bmp
diff --git a/rosapps/tests/carets/carets.c b/rostests/tests/carets/carets.c
similarity index 100%
rename from rosapps/tests/carets/carets.c
rename to rostests/tests/carets/carets.c
diff --git a/rosapps/tests/carets/carets.rbuild b/rostests/tests/carets/carets.rbuild
similarity index 100%
rename from rosapps/tests/carets/carets.rbuild
rename to rostests/tests/carets/carets.rbuild
diff --git a/rosapps/tests/carets/carets.rc b/rostests/tests/carets/carets.rc
similarity index 100%
rename from rosapps/tests/carets/carets.rc
rename to rostests/tests/carets/carets.rc
diff --git a/rosapps/tests/carets/resource.h b/rostests/tests/carets/resource.h
similarity index 100%
rename from rosapps/tests/carets/resource.h
rename to rostests/tests/carets/resource.h
diff --git a/rosapps/tests/combotst/combotst.c b/rostests/tests/combotst/combotst.c
similarity index 100%
rename from rosapps/tests/combotst/combotst.c
rename to rostests/tests/combotst/combotst.c
diff --git a/rosapps/tests/combotst/combotst.rbuild b/rostests/tests/combotst/combotst.rbuild
similarity index 100%
rename from rosapps/tests/combotst/combotst.rbuild
rename to rostests/tests/combotst/combotst.rbuild
diff --git a/rosapps/tests/combotst/utils.c b/rostests/tests/combotst/utils.c
similarity index 100%
rename from rosapps/tests/combotst/utils.c
rename to rostests/tests/combotst/utils.c
diff --git a/rosapps/tests/combotst/utils.h b/rostests/tests/combotst/utils.h
similarity index 100%
rename from rosapps/tests/combotst/utils.h
rename to rostests/tests/combotst/utils.h
diff --git a/rosapps/tests/consume/consume.c b/rostests/tests/consume/consume.c
similarity index 100%
rename from rosapps/tests/consume/consume.c
rename to rostests/tests/consume/consume.c
diff --git a/rosapps/tests/consume/consume.rbuild b/rostests/tests/consume/consume.rbuild
similarity index 100%
rename from rosapps/tests/consume/consume.rbuild
rename to rostests/tests/consume/consume.rbuild
diff --git a/rosapps/tests/copymove/copymove.c b/rostests/tests/copymove/copymove.c
similarity index 100%
rename from rosapps/tests/copymove/copymove.c
rename to rostests/tests/copymove/copymove.c
diff --git a/rosapps/tests/copymove/copymove.rbuild b/rostests/tests/copymove/copymove.rbuild
similarity index 100%
rename from rosapps/tests/copymove/copymove.rbuild
rename to rostests/tests/copymove/copymove.rbuild
diff --git a/rosapps/tests/count/count.c b/rostests/tests/count/count.c
similarity index 100%
rename from rosapps/tests/count/count.c
rename to rostests/tests/count/count.c
diff --git a/rosapps/tests/count/count.rbuild b/rostests/tests/count/count.rbuild
similarity index 100%
rename from rosapps/tests/count/count.rbuild
rename to rostests/tests/count/count.rbuild
diff --git a/rosapps/tests/create-links/create-links.c b/rostests/tests/create-links/create-links.c
similarity index 100%
rename from rosapps/tests/create-links/create-links.c
rename to rostests/tests/create-links/create-links.c
diff --git a/rosapps/tests/create-links/create-links.rbuild b/rostests/tests/create-links/create-links.rbuild
similarity index 100%
rename from rosapps/tests/create-links/create-links.rbuild
rename to rostests/tests/create-links/create-links.rbuild
diff --git a/rosapps/tests/dibtest/dibtest.c b/rostests/tests/dibtest/dibtest.c
similarity index 100%
rename from rosapps/tests/dibtest/dibtest.c
rename to rostests/tests/dibtest/dibtest.c
diff --git a/rosapps/tests/dibtest/dibtest.rbuild b/rostests/tests/dibtest/dibtest.rbuild
similarity index 100%
rename from rosapps/tests/dibtest/dibtest.rbuild
rename to rostests/tests/dibtest/dibtest.rbuild
diff --git a/rosapps/tests/dirdlg/dirdlg.c b/rostests/tests/dirdlg/dirdlg.c
similarity index 100%
rename from rosapps/tests/dirdlg/dirdlg.c
rename to rostests/tests/dirdlg/dirdlg.c
diff --git a/rosapps/tests/dirdlg/dirdlg.rbuild b/rostests/tests/dirdlg/dirdlg.rbuild
similarity index 100%
rename from rosapps/tests/dirdlg/dirdlg.rbuild
rename to rostests/tests/dirdlg/dirdlg.rbuild
diff --git a/rosapps/tests/dirdlg/dirdlg.rc b/rostests/tests/dirdlg/dirdlg.rc
similarity index 100%
rename from rosapps/tests/dirdlg/dirdlg.rc
rename to rostests/tests/dirdlg/dirdlg.rc
diff --git a/rosapps/tests/dirdlg/resource.h b/rostests/tests/dirdlg/resource.h
similarity index 100%
rename from rosapps/tests/dirdlg/resource.h
rename to rostests/tests/dirdlg/resource.h
diff --git a/rosapps/tests/directory.rbuild b/rostests/tests/directory.rbuild
similarity index 100%
rename from rosapps/tests/directory.rbuild
rename to rostests/tests/directory.rbuild
diff --git a/rosapps/tests/diskspeed/diskspeed.c b/rostests/tests/diskspeed/diskspeed.c
similarity index 100%
rename from rosapps/tests/diskspeed/diskspeed.c
rename to rostests/tests/diskspeed/diskspeed.c
diff --git a/rosapps/tests/diskspeed/diskspeed.rbuild b/rostests/tests/diskspeed/diskspeed.rbuild
similarity index 100%
rename from rosapps/tests/diskspeed/diskspeed.rbuild
rename to rostests/tests/diskspeed/diskspeed.rbuild
diff --git a/rosapps/tests/dnsapi/dnsapi.c b/rostests/tests/dnsapi/dnsapi.c
similarity index 100%
rename from rosapps/tests/dnsapi/dnsapi.c
rename to rostests/tests/dnsapi/dnsapi.c
diff --git a/rosapps/tests/dnsapi/dnsapi.rbuild b/rostests/tests/dnsapi/dnsapi.rbuild
similarity index 100%
rename from rosapps/tests/dnsapi/dnsapi.rbuild
rename to rostests/tests/dnsapi/dnsapi.rbuild
diff --git a/rosapps/tests/dnsquery/dnsquery.c b/rostests/tests/dnsquery/dnsquery.c
similarity index 100%
rename from rosapps/tests/dnsquery/dnsquery.c
rename to rostests/tests/dnsquery/dnsquery.c
diff --git a/rosapps/tests/dnsquery/dnsquery.rbuild b/rostests/tests/dnsquery/dnsquery.rbuild
similarity index 100%
rename from rosapps/tests/dnsquery/dnsquery.rbuild
rename to rostests/tests/dnsquery/dnsquery.rbuild
diff --git a/rosapps/tests/edit/edit.rbuild b/rostests/tests/edit/edit.rbuild
similarity index 100%
rename from rosapps/tests/edit/edit.rbuild
rename to rostests/tests/edit/edit.rbuild
diff --git a/rosapps/tests/edit/edittest.c b/rostests/tests/edit/edittest.c
similarity index 100%
rename from rosapps/tests/edit/edittest.c
rename to rostests/tests/edit/edittest.c
diff --git a/rosapps/tests/edit/utils.c b/rostests/tests/edit/utils.c
similarity index 100%
rename from rosapps/tests/edit/utils.c
rename to rostests/tests/edit/utils.c
diff --git a/rosapps/tests/edit/utils.h b/rostests/tests/edit/utils.h
similarity index 100%
rename from rosapps/tests/edit/utils.h
rename to rostests/tests/edit/utils.h
diff --git a/rosapps/tests/enhmetafile/enhmetafile.c b/rostests/tests/enhmetafile/enhmetafile.c
similarity index 100%
rename from rosapps/tests/enhmetafile/enhmetafile.c
rename to rostests/tests/enhmetafile/enhmetafile.c
diff --git a/rosapps/tests/enhmetafile/enhmetafile.rbuild b/rostests/tests/enhmetafile/enhmetafile.rbuild
similarity index 100%
rename from rosapps/tests/enhmetafile/enhmetafile.rbuild
rename to rostests/tests/enhmetafile/enhmetafile.rbuild
diff --git a/rosapps/tests/enhmetafile/test.emf b/rostests/tests/enhmetafile/test.emf
similarity index 100%
rename from rosapps/tests/enhmetafile/test.emf
rename to rostests/tests/enhmetafile/test.emf
diff --git a/rosapps/tests/enumfonts/enumfonts.cpp b/rostests/tests/enumfonts/enumfonts.cpp
similarity index 100%
rename from rosapps/tests/enumfonts/enumfonts.cpp
rename to rostests/tests/enumfonts/enumfonts.cpp
diff --git a/rosapps/tests/enumfonts/enumfonts.rbuild b/rostests/tests/enumfonts/enumfonts.rbuild
similarity index 100%
rename from rosapps/tests/enumfonts/enumfonts.rbuild
rename to rostests/tests/enumfonts/enumfonts.rbuild
diff --git a/rosapps/tests/enumwnd/enumwnd.c b/rostests/tests/enumwnd/enumwnd.c
similarity index 100%
rename from rosapps/tests/enumwnd/enumwnd.c
rename to rostests/tests/enumwnd/enumwnd.c
diff --git a/rosapps/tests/enumwnd/enumwnd.dsp b/rostests/tests/enumwnd/enumwnd.dsp
similarity index 100%
rename from rosapps/tests/enumwnd/enumwnd.dsp
rename to rostests/tests/enumwnd/enumwnd.dsp
diff --git a/rosapps/tests/enumwnd/enumwnd.rbuild b/rostests/tests/enumwnd/enumwnd.rbuild
similarity index 100%
rename from rosapps/tests/enumwnd/enumwnd.rbuild
rename to rostests/tests/enumwnd/enumwnd.rbuild
diff --git a/rosapps/tests/enumws/enumws.c b/rostests/tests/enumws/enumws.c
similarity index 100%
rename from rosapps/tests/enumws/enumws.c
rename to rostests/tests/enumws/enumws.c
diff --git a/rosapps/tests/enumws/enumws.rbuild b/rostests/tests/enumws/enumws.rbuild
similarity index 100%
rename from rosapps/tests/enumws/enumws.rbuild
rename to rostests/tests/enumws/enumws.rbuild
diff --git a/rosapps/tests/event/event.c b/rostests/tests/event/event.c
similarity index 100%
rename from rosapps/tests/event/event.c
rename to rostests/tests/event/event.c
diff --git a/rosapps/tests/event/event.rbuild b/rostests/tests/event/event.rbuild
similarity index 100%
rename from rosapps/tests/event/event.rbuild
rename to rostests/tests/event/event.rbuild
diff --git a/rosapps/tests/fiber/fiber.c b/rostests/tests/fiber/fiber.c
similarity index 100%
rename from rosapps/tests/fiber/fiber.c
rename to rostests/tests/fiber/fiber.c
diff --git a/rosapps/tests/fiber/fiber.rbuild b/rostests/tests/fiber/fiber.rbuild
similarity index 100%
rename from rosapps/tests/fiber/fiber.rbuild
rename to rostests/tests/fiber/fiber.rbuild
diff --git a/rosapps/tests/gethostbyname/gethostbyname.c b/rostests/tests/gethostbyname/gethostbyname.c
similarity index 100%
rename from rosapps/tests/gethostbyname/gethostbyname.c
rename to rostests/tests/gethostbyname/gethostbyname.c
diff --git a/rosapps/tests/gethostbyname/gethostbyname.rbuild b/rostests/tests/gethostbyname/gethostbyname.rbuild
similarity index 100%
rename from rosapps/tests/gethostbyname/gethostbyname.rbuild
rename to rostests/tests/gethostbyname/gethostbyname.rbuild
diff --git a/rosapps/tests/global_mem/global_mem.c b/rostests/tests/global_mem/global_mem.c
similarity index 100%
rename from rosapps/tests/global_mem/global_mem.c
rename to rostests/tests/global_mem/global_mem.c
diff --git a/rosapps/tests/global_mem/global_mem.rbuild b/rostests/tests/global_mem/global_mem.rbuild
similarity index 100%
rename from rosapps/tests/global_mem/global_mem.rbuild
rename to rostests/tests/global_mem/global_mem.rbuild
diff --git a/rosapps/tests/gradient/gradient.c b/rostests/tests/gradient/gradient.c
similarity index 100%
rename from rosapps/tests/gradient/gradient.c
rename to rostests/tests/gradient/gradient.c
diff --git a/rosapps/tests/gradient/gradient.rbuild b/rostests/tests/gradient/gradient.rbuild
similarity index 100%
rename from rosapps/tests/gradient/gradient.rbuild
rename to rostests/tests/gradient/gradient.rbuild
diff --git a/rosapps/tests/guithreadinfo/guithreadinfo.c b/rostests/tests/guithreadinfo/guithreadinfo.c
similarity index 100%
rename from rosapps/tests/guithreadinfo/guithreadinfo.c
rename to rostests/tests/guithreadinfo/guithreadinfo.c
diff --git a/rosapps/tests/guithreadinfo/guithreadinfo.rbuild b/rostests/tests/guithreadinfo/guithreadinfo.rbuild
similarity index 100%
rename from rosapps/tests/guithreadinfo/guithreadinfo.rbuild
rename to rostests/tests/guithreadinfo/guithreadinfo.rbuild
diff --git a/rosapps/tests/hello/hello.c b/rostests/tests/hello/hello.c
similarity index 100%
rename from rosapps/tests/hello/hello.c
rename to rostests/tests/hello/hello.c
diff --git a/rosapps/tests/hello/hello.rbuild b/rostests/tests/hello/hello.rbuild
similarity index 100%
rename from rosapps/tests/hello/hello.rbuild
rename to rostests/tests/hello/hello.rbuild
diff --git a/rosapps/tests/hivetest/hivetest.c b/rostests/tests/hivetest/hivetest.c
similarity index 100%
rename from rosapps/tests/hivetest/hivetest.c
rename to rostests/tests/hivetest/hivetest.c
diff --git a/rosapps/tests/hivetest/hivetest.rbuild b/rostests/tests/hivetest/hivetest.rbuild
similarity index 100%
rename from rosapps/tests/hivetest/hivetest.rbuild
rename to rostests/tests/hivetest/hivetest.rbuild
diff --git a/rosapps/tests/icontest/icon.ico b/rostests/tests/icontest/icon.ico
similarity index 100%
rename from rosapps/tests/icontest/icon.ico
rename to rostests/tests/icontest/icon.ico
diff --git a/rosapps/tests/icontest/icontest.c b/rostests/tests/icontest/icontest.c
similarity index 100%
rename from rosapps/tests/icontest/icontest.c
rename to rostests/tests/icontest/icontest.c
diff --git a/rosapps/tests/icontest/icontest.rbuild b/rostests/tests/icontest/icontest.rbuild
similarity index 100%
rename from rosapps/tests/icontest/icontest.rbuild
rename to rostests/tests/icontest/icontest.rbuild
diff --git a/rosapps/tests/icontest/icontest.rc b/rostests/tests/icontest/icontest.rc
similarity index 100%
rename from rosapps/tests/icontest/icontest.rc
rename to rostests/tests/icontest/icontest.rc
diff --git a/rosapps/tests/icontest/resource.h b/rostests/tests/icontest/resource.h
similarity index 100%
rename from rosapps/tests/icontest/resource.h
rename to rostests/tests/icontest/resource.h
diff --git a/rosapps/tests/iptest/iptest.cpp b/rostests/tests/iptest/iptest.cpp
similarity index 100%
rename from rosapps/tests/iptest/iptest.cpp
rename to rostests/tests/iptest/iptest.cpp
diff --git a/rosapps/tests/iptest/iptest.rbuild b/rostests/tests/iptest/iptest.rbuild
similarity index 100%
rename from rosapps/tests/iptest/iptest.rbuild
rename to rostests/tests/iptest/iptest.rbuild
diff --git a/rosapps/tests/isotest/isotest.c b/rostests/tests/isotest/isotest.c
similarity index 100%
rename from rosapps/tests/isotest/isotest.c
rename to rostests/tests/isotest/isotest.c
diff --git a/rosapps/tests/isotest/isotest.rbuild b/rostests/tests/isotest/isotest.rbuild
similarity index 100%
rename from rosapps/tests/isotest/isotest.rbuild
rename to rostests/tests/isotest/isotest.rbuild
diff --git a/rosapps/tests/lantst/lantest.cpp b/rostests/tests/lantst/lantest.cpp
similarity index 100%
rename from rosapps/tests/lantst/lantest.cpp
rename to rostests/tests/lantst/lantest.cpp
diff --git a/rosapps/tests/lantst/lantest.rbuild b/rostests/tests/lantst/lantest.rbuild
similarity index 100%
rename from rosapps/tests/lantst/lantest.rbuild
rename to rostests/tests/lantst/lantest.rbuild
diff --git a/rosapps/tests/lineclip/lineclip.c b/rostests/tests/lineclip/lineclip.c
similarity index 100%
rename from rosapps/tests/lineclip/lineclip.c
rename to rostests/tests/lineclip/lineclip.c
diff --git a/rosapps/tests/lineclip/lineclip.rbuild b/rostests/tests/lineclip/lineclip.rbuild
similarity index 100%
rename from rosapps/tests/lineclip/lineclip.rbuild
rename to rostests/tests/lineclip/lineclip.rbuild
diff --git a/rosapps/tests/linetest/linetest.c b/rostests/tests/linetest/linetest.c
similarity index 100%
rename from rosapps/tests/linetest/linetest.c
rename to rostests/tests/linetest/linetest.c
diff --git a/rosapps/tests/linetest/linetest.rbuild b/rostests/tests/linetest/linetest.rbuild
similarity index 100%
rename from rosapps/tests/linetest/linetest.rbuild
rename to rostests/tests/linetest/linetest.rbuild
diff --git a/rosapps/tests/lpctst/conport.c b/rostests/tests/lpctst/conport.c
similarity index 100%
rename from rosapps/tests/lpctst/conport.c
rename to rostests/tests/lpctst/conport.c
diff --git a/rosapps/tests/lpctst/creport.c b/rostests/tests/lpctst/creport.c
similarity index 100%
rename from rosapps/tests/lpctst/creport.c
rename to rostests/tests/lpctst/creport.c
diff --git a/rosapps/tests/lpctst/dumpinfo.c b/rostests/tests/lpctst/dumpinfo.c
similarity index 100%
rename from rosapps/tests/lpctst/dumpinfo.c
rename to rostests/tests/lpctst/dumpinfo.c
diff --git a/rosapps/tests/lpctst/dumpinfo.h b/rostests/tests/lpctst/dumpinfo.h
similarity index 100%
rename from rosapps/tests/lpctst/dumpinfo.h
rename to rostests/tests/lpctst/dumpinfo.h
diff --git a/rosapps/tests/lpctst/lpcclt.c b/rostests/tests/lpctst/lpcclt.c
similarity index 100%
rename from rosapps/tests/lpctst/lpcclt.c
rename to rostests/tests/lpctst/lpcclt.c
diff --git a/rosapps/tests/lpctst/lpcsrv.c b/rostests/tests/lpctst/lpcsrv.c
similarity index 100%
rename from rosapps/tests/lpctst/lpcsrv.c
rename to rostests/tests/lpctst/lpcsrv.c
diff --git a/rosapps/tests/lpctst/lpctest.h b/rostests/tests/lpctst/lpctest.h
similarity index 100%
rename from rosapps/tests/lpctst/lpctest.h
rename to rostests/tests/lpctst/lpctest.h
diff --git a/rosapps/tests/lpctst/lpctst.rbuild b/rostests/tests/lpctst/lpctst.rbuild
similarity index 100%
rename from rosapps/tests/lpctst/lpctst.rbuild
rename to rostests/tests/lpctst/lpctst.rbuild
diff --git a/rosapps/tests/map_dup_inherit/map_dup_inherit.c b/rostests/tests/map_dup_inherit/map_dup_inherit.c
similarity index 100%
rename from rosapps/tests/map_dup_inherit/map_dup_inherit.c
rename to rostests/tests/map_dup_inherit/map_dup_inherit.c
diff --git a/rosapps/tests/map_dup_inherit/map_dup_inherit.rbuild b/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
similarity index 100%
rename from rosapps/tests/map_dup_inherit/map_dup_inherit.rbuild
rename to rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
diff --git a/rosapps/tests/mdi/mdi.c b/rostests/tests/mdi/mdi.c
similarity index 100%
rename from rosapps/tests/mdi/mdi.c
rename to rostests/tests/mdi/mdi.c
diff --git a/rosapps/tests/mdi/mdi.rbuild b/rostests/tests/mdi/mdi.rbuild
similarity index 100%
rename from rosapps/tests/mdi/mdi.rbuild
rename to rostests/tests/mdi/mdi.rbuild
diff --git a/rosapps/tests/mdi/mdi.rc b/rostests/tests/mdi/mdi.rc
similarity index 100%
rename from rosapps/tests/mdi/mdi.rc
rename to rostests/tests/mdi/mdi.rc
diff --git a/rosapps/tests/mdi/resource.h b/rostests/tests/mdi/resource.h
similarity index 100%
rename from rosapps/tests/mdi/resource.h
rename to rostests/tests/mdi/resource.h
diff --git a/rosapps/tests/miditest/miditest.c b/rostests/tests/miditest/miditest.c
similarity index 100%
rename from rosapps/tests/miditest/miditest.c
rename to rostests/tests/miditest/miditest.c
diff --git a/rosapps/tests/miditest/miditest.rbuild b/rostests/tests/miditest/miditest.rbuild
similarity index 100%
rename from rosapps/tests/miditest/miditest.rbuild
rename to rostests/tests/miditest/miditest.rbuild
diff --git a/rosapps/tests/miditest/miditest.rc b/rostests/tests/miditest/miditest.rc
similarity index 100%
rename from rosapps/tests/miditest/miditest.rc
rename to rostests/tests/miditest/miditest.rc
diff --git a/rosapps/tests/mktime/mktime.c b/rostests/tests/mktime/mktime.c
similarity index 100%
rename from rosapps/tests/mktime/mktime.c
rename to rostests/tests/mktime/mktime.c
diff --git a/rosapps/tests/mktime/mktime.rbuild b/rostests/tests/mktime/mktime.rbuild
similarity index 100%
rename from rosapps/tests/mktime/mktime.rbuild
rename to rostests/tests/mktime/mktime.rbuild
diff --git a/rosapps/tests/moztest/moztest.c b/rostests/tests/moztest/moztest.c
similarity index 100%
rename from rosapps/tests/moztest/moztest.c
rename to rostests/tests/moztest/moztest.c
diff --git a/rosapps/tests/moztest/moztest.rbuild b/rostests/tests/moztest/moztest.rbuild
similarity index 100%
rename from rosapps/tests/moztest/moztest.rbuild
rename to rostests/tests/moztest/moztest.rbuild
diff --git a/rosapps/tests/mstest/msclient.c b/rostests/tests/mstest/msclient.c
similarity index 100%
rename from rosapps/tests/mstest/msclient.c
rename to rostests/tests/mstest/msclient.c
diff --git a/rosapps/tests/mstest/msserver.c b/rostests/tests/mstest/msserver.c
similarity index 100%
rename from rosapps/tests/mstest/msserver.c
rename to rostests/tests/mstest/msserver.c
diff --git a/rosapps/tests/mstest/mstest.rbuild b/rostests/tests/mstest/mstest.rbuild
similarity index 100%
rename from rosapps/tests/mstest/mstest.rbuild
rename to rostests/tests/mstest/mstest.rbuild
diff --git a/rosapps/tests/multithrdwin/multithrdwin.c b/rostests/tests/multithrdwin/multithrdwin.c
similarity index 100%
rename from rosapps/tests/multithrdwin/multithrdwin.c
rename to rostests/tests/multithrdwin/multithrdwin.c
diff --git a/rosapps/tests/multithrdwin/multithrdwin.rbuild b/rostests/tests/multithrdwin/multithrdwin.rbuild
similarity index 100%
rename from rosapps/tests/multithrdwin/multithrdwin.rbuild
rename to rostests/tests/multithrdwin/multithrdwin.rbuild
diff --git a/rosapps/tests/multiwin/multiwin.c b/rostests/tests/multiwin/multiwin.c
similarity index 100%
rename from rosapps/tests/multiwin/multiwin.c
rename to rostests/tests/multiwin/multiwin.c
diff --git a/rosapps/tests/multiwin/multiwin.rbuild b/rostests/tests/multiwin/multiwin.rbuild
similarity index 100%
rename from rosapps/tests/multiwin/multiwin.rbuild
rename to rostests/tests/multiwin/multiwin.rbuild
diff --git a/rosapps/tests/mutex/mutex.c b/rostests/tests/mutex/mutex.c
similarity index 100%
rename from rosapps/tests/mutex/mutex.c
rename to rostests/tests/mutex/mutex.c
diff --git a/rosapps/tests/mutex/mutex.rbuild b/rostests/tests/mutex/mutex.rbuild
similarity index 100%
rename from rosapps/tests/mutex/mutex.rbuild
rename to rostests/tests/mutex/mutex.rbuild
diff --git a/rosapps/tests/nameserverlist/nameserverlist.c b/rostests/tests/nameserverlist/nameserverlist.c
similarity index 100%
rename from rosapps/tests/nameserverlist/nameserverlist.c
rename to rostests/tests/nameserverlist/nameserverlist.c
diff --git a/rosapps/tests/nameserverlist/nameserverlist.rbuild b/rostests/tests/nameserverlist/nameserverlist.rbuild
similarity index 100%
rename from rosapps/tests/nameserverlist/nameserverlist.rbuild
rename to rostests/tests/nameserverlist/nameserverlist.rbuild
diff --git a/rosapps/tests/noexecute/noexecute.c b/rostests/tests/noexecute/noexecute.c
similarity index 100%
rename from rosapps/tests/noexecute/noexecute.c
rename to rostests/tests/noexecute/noexecute.c
diff --git a/rosapps/tests/noexecute/noexecute.rbuild b/rostests/tests/noexecute/noexecute.rbuild
similarity index 100%
rename from rosapps/tests/noexecute/noexecute.rbuild
rename to rostests/tests/noexecute/noexecute.rbuild
diff --git a/rosapps/tests/nptest/npclient.c b/rostests/tests/nptest/npclient.c
similarity index 100%
rename from rosapps/tests/nptest/npclient.c
rename to rostests/tests/nptest/npclient.c
diff --git a/rosapps/tests/nptest/npserver.c b/rostests/tests/nptest/npserver.c
similarity index 100%
rename from rosapps/tests/nptest/npserver.c
rename to rostests/tests/nptest/npserver.c
diff --git a/rosapps/tests/nptest/nptest.rbuild b/rostests/tests/nptest/nptest.rbuild
similarity index 100%
rename from rosapps/tests/nptest/nptest.rbuild
rename to rostests/tests/nptest/nptest.rbuild
diff --git a/rosapps/tests/oskittcp/cmd_oskit.py b/rostests/tests/oskittcp/cmd_oskit.py
similarity index 100%
rename from rosapps/tests/oskittcp/cmd_oskit.py
rename to rostests/tests/oskittcp/cmd_oskit.py
diff --git a/rosapps/tests/oskittcp/oskittcp.rbuild b/rostests/tests/oskittcp/oskittcp.rbuild
similarity index 100%
rename from rosapps/tests/oskittcp/oskittcp.rbuild
rename to rostests/tests/oskittcp/oskittcp.rbuild
diff --git a/rosapps/tests/oskittcp/tcptest.cpp b/rostests/tests/oskittcp/tcptest.cpp
similarity index 100%
rename from rosapps/tests/oskittcp/tcptest.cpp
rename to rostests/tests/oskittcp/tcptest.cpp
diff --git a/rosapps/tests/oskittcp/tcptest.dsp b/rostests/tests/oskittcp/tcptest.dsp
similarity index 100%
rename from rosapps/tests/oskittcp/tcptest.dsp
rename to rostests/tests/oskittcp/tcptest.dsp
diff --git a/rosapps/tests/oskittcp/tcptest.dsw b/rostests/tests/oskittcp/tcptest.dsw
similarity index 100%
rename from rosapps/tests/oskittcp/tcptest.dsw
rename to rostests/tests/oskittcp/tcptest.dsw
diff --git a/rosapps/tests/p_dup_handle/p_dup_handle.c b/rostests/tests/p_dup_handle/p_dup_handle.c
similarity index 100%
rename from rosapps/tests/p_dup_handle/p_dup_handle.c
rename to rostests/tests/p_dup_handle/p_dup_handle.c
diff --git a/rosapps/tests/p_dup_handle/p_dup_handle.rbuild b/rostests/tests/p_dup_handle/p_dup_handle.rbuild
similarity index 100%
rename from rosapps/tests/p_dup_handle/p_dup_handle.rbuild
rename to rostests/tests/p_dup_handle/p_dup_handle.rbuild
diff --git a/rosapps/tests/palbitblt/pal.c b/rostests/tests/palbitblt/pal.c
similarity index 100%
rename from rosapps/tests/palbitblt/pal.c
rename to rostests/tests/palbitblt/pal.c
diff --git a/rosapps/tests/palbitblt/palbitblt.rbuild b/rostests/tests/palbitblt/palbitblt.rbuild
similarity index 100%
rename from rosapps/tests/palbitblt/palbitblt.rbuild
rename to rostests/tests/palbitblt/palbitblt.rbuild
diff --git a/rosapps/tests/patblt/Penguin.bmp b/rostests/tests/patblt/Penguin.bmp
similarity index 100%
rename from rosapps/tests/patblt/Penguin.bmp
rename to rostests/tests/patblt/Penguin.bmp
diff --git a/rosapps/tests/patblt/patblt.cpp b/rostests/tests/patblt/patblt.cpp
similarity index 100%
rename from rosapps/tests/patblt/patblt.cpp
rename to rostests/tests/patblt/patblt.cpp
diff --git a/rosapps/tests/patblt/patblt.rbuild b/rostests/tests/patblt/patblt.rbuild
similarity index 100%
rename from rosapps/tests/patblt/patblt.rbuild
rename to rostests/tests/patblt/patblt.rbuild
diff --git a/rosapps/tests/polytest/polytest.cpp b/rostests/tests/polytest/polytest.cpp
similarity index 100%
rename from rosapps/tests/polytest/polytest.cpp
rename to rostests/tests/polytest/polytest.cpp
diff --git a/rosapps/tests/polytest/polytest.dsp b/rostests/tests/polytest/polytest.dsp
similarity index 100%
rename from rosapps/tests/polytest/polytest.dsp
rename to rostests/tests/polytest/polytest.dsp
diff --git a/rosapps/tests/polytest/polytest.dsw b/rostests/tests/polytest/polytest.dsw
similarity index 100%
rename from rosapps/tests/polytest/polytest.dsw
rename to rostests/tests/polytest/polytest.dsw
diff --git a/rosapps/tests/polytest/polytest.rbuild b/rostests/tests/polytest/polytest.rbuild
similarity index 100%
rename from rosapps/tests/polytest/polytest.rbuild
rename to rostests/tests/polytest/polytest.rbuild
diff --git a/rosapps/tests/popupmenu/popupmenu.c b/rostests/tests/popupmenu/popupmenu.c
similarity index 100%
rename from rosapps/tests/popupmenu/popupmenu.c
rename to rostests/tests/popupmenu/popupmenu.c
diff --git a/rosapps/tests/popupmenu/popupmenu.rbuild b/rostests/tests/popupmenu/popupmenu.rbuild
similarity index 100%
rename from rosapps/tests/popupmenu/popupmenu.rbuild
rename to rostests/tests/popupmenu/popupmenu.rbuild
diff --git a/rosapps/tests/popupmenu/popupmenu.rc b/rostests/tests/popupmenu/popupmenu.rc
similarity index 100%
rename from rosapps/tests/popupmenu/popupmenu.rc
rename to rostests/tests/popupmenu/popupmenu.rc
diff --git a/rosapps/tests/popupmenu/resource.h b/rostests/tests/popupmenu/resource.h
similarity index 100%
rename from rosapps/tests/popupmenu/resource.h
rename to rostests/tests/popupmenu/resource.h
diff --git a/rosapps/tests/primitives/mk_font.cpp b/rostests/tests/primitives/mk_font.cpp
similarity index 100%
rename from rosapps/tests/primitives/mk_font.cpp
rename to rostests/tests/primitives/mk_font.cpp
diff --git a/rosapps/tests/primitives/mk_font.h b/rostests/tests/primitives/mk_font.h
similarity index 100%
rename from rosapps/tests/primitives/mk_font.h
rename to rostests/tests/primitives/mk_font.h
diff --git a/rosapps/tests/primitives/primitives.cpp b/rostests/tests/primitives/primitives.cpp
similarity index 100%
rename from rosapps/tests/primitives/primitives.cpp
rename to rostests/tests/primitives/primitives.cpp
diff --git a/rosapps/tests/primitives/primitives.rbuild b/rostests/tests/primitives/primitives.rbuild
similarity index 100%
rename from rosapps/tests/primitives/primitives.rbuild
rename to rostests/tests/primitives/primitives.rbuild
diff --git a/rosapps/tests/pteb/pteb.c b/rostests/tests/pteb/pteb.c
similarity index 100%
rename from rosapps/tests/pteb/pteb.c
rename to rostests/tests/pteb/pteb.c
diff --git a/rosapps/tests/pteb/pteb.rbuild b/rostests/tests/pteb/pteb.rbuild
similarity index 100%
rename from rosapps/tests/pteb/pteb.rbuild
rename to rostests/tests/pteb/pteb.rbuild
diff --git a/rosapps/tests/readconsole/main.c b/rostests/tests/readconsole/main.c
similarity index 100%
rename from rosapps/tests/readconsole/main.c
rename to rostests/tests/readconsole/main.c
diff --git a/rosapps/tests/readconsole/readconsole.rbuild b/rostests/tests/readconsole/readconsole.rbuild
similarity index 100%
rename from rosapps/tests/readconsole/readconsole.rbuild
rename to rostests/tests/readconsole/readconsole.rbuild
diff --git a/rosapps/tests/regdump/main.c b/rostests/tests/regdump/main.c
similarity index 100%
rename from rosapps/tests/regdump/main.c
rename to rostests/tests/regdump/main.c
diff --git a/rosapps/tests/regdump/regcmds.c b/rostests/tests/regdump/regcmds.c
similarity index 100%
rename from rosapps/tests/regdump/regcmds.c
rename to rostests/tests/regdump/regcmds.c
diff --git a/rosapps/tests/regdump/regdump.c b/rostests/tests/regdump/regdump.c
similarity index 100%
rename from rosapps/tests/regdump/regdump.c
rename to rostests/tests/regdump/regdump.c
diff --git a/rosapps/tests/regdump/regdump.h b/rostests/tests/regdump/regdump.h
similarity index 100%
rename from rosapps/tests/regdump/regdump.h
rename to rostests/tests/regdump/regdump.h
diff --git a/rosapps/tests/regdump/regdump.rbuild b/rostests/tests/regdump/regdump.rbuild
similarity index 100%
rename from rosapps/tests/regdump/regdump.rbuild
rename to rostests/tests/regdump/regdump.rbuild
diff --git a/rosapps/tests/regdump/regproc.c b/rostests/tests/regdump/regproc.c
similarity index 100%
rename from rosapps/tests/regdump/regproc.c
rename to rostests/tests/regdump/regproc.c
diff --git a/rosapps/tests/regdump/regproc.h b/rostests/tests/regdump/regproc.h
similarity index 100%
rename from rosapps/tests/regdump/regproc.h
rename to rostests/tests/regdump/regproc.h
diff --git a/rosapps/tests/regqueryvalue/regqueryvalue.c b/rostests/tests/regqueryvalue/regqueryvalue.c
similarity index 100%
rename from rosapps/tests/regqueryvalue/regqueryvalue.c
rename to rostests/tests/regqueryvalue/regqueryvalue.c
diff --git a/rosapps/tests/regqueryvalue/regqueryvalue.rbuild b/rostests/tests/regqueryvalue/regqueryvalue.rbuild
similarity index 100%
rename from rosapps/tests/regqueryvalue/regqueryvalue.rbuild
rename to rostests/tests/regqueryvalue/regqueryvalue.rbuild
diff --git a/rosapps/tests/regtest/regtest.c b/rostests/tests/regtest/regtest.c
similarity index 100%
rename from rosapps/tests/regtest/regtest.c
rename to rostests/tests/regtest/regtest.c
diff --git a/rosapps/tests/regtest/regtest.rbuild b/rostests/tests/regtest/regtest.rbuild
similarity index 100%
rename from rosapps/tests/regtest/regtest.rbuild
rename to rostests/tests/regtest/regtest.rbuild
diff --git a/rosapps/tests/sectest/sectest.c b/rostests/tests/sectest/sectest.c
similarity index 100%
rename from rosapps/tests/sectest/sectest.c
rename to rostests/tests/sectest/sectest.c
diff --git a/rosapps/tests/sectest/sectest.rbuild b/rostests/tests/sectest/sectest.rbuild
similarity index 100%
rename from rosapps/tests/sectest/sectest.rbuild
rename to rostests/tests/sectest/sectest.rbuild
diff --git a/rosapps/tests/sertest/sertest.c b/rostests/tests/sertest/sertest.c
similarity index 100%
rename from rosapps/tests/sertest/sertest.c
rename to rostests/tests/sertest/sertest.c
diff --git a/rosapps/tests/sertest/sertest.rbuild b/rostests/tests/sertest/sertest.rbuild
similarity index 100%
rename from rosapps/tests/sertest/sertest.rbuild
rename to rostests/tests/sertest/sertest.rbuild
diff --git a/rosapps/tests/shaptest/shaptest.c b/rostests/tests/shaptest/shaptest.c
similarity index 100%
rename from rosapps/tests/shaptest/shaptest.c
rename to rostests/tests/shaptest/shaptest.c
diff --git a/rosapps/tests/shaptest/shaptest.rbuild b/rostests/tests/shaptest/shaptest.rbuild
similarity index 100%
rename from rosapps/tests/shaptest/shaptest.rbuild
rename to rostests/tests/shaptest/shaptest.rbuild
diff --git a/rosapps/tests/shm/shm.rbuild b/rostests/tests/shm/shm.rbuild
similarity index 100%
rename from rosapps/tests/shm/shm.rbuild
rename to rostests/tests/shm/shm.rbuild
diff --git a/rosapps/tests/shm/shmclt.c b/rostests/tests/shm/shmclt.c
similarity index 100%
rename from rosapps/tests/shm/shmclt.c
rename to rostests/tests/shm/shmclt.c
diff --git a/rosapps/tests/shm/shmsrv.c b/rostests/tests/shm/shmsrv.c
similarity index 100%
rename from rosapps/tests/shm/shmsrv.c
rename to rostests/tests/shm/shmsrv.c
diff --git a/rosapps/tests/statst/statst.c b/rostests/tests/statst/statst.c
similarity index 100%
rename from rosapps/tests/statst/statst.c
rename to rostests/tests/statst/statst.c
diff --git a/rosapps/tests/statst/statst.rbuild b/rostests/tests/statst/statst.rbuild
similarity index 100%
rename from rosapps/tests/statst/statst.rbuild
rename to rostests/tests/statst/statst.rbuild
diff --git a/rosapps/tests/statst2/statst2.c b/rostests/tests/statst2/statst2.c
similarity index 100%
rename from rosapps/tests/statst2/statst2.c
rename to rostests/tests/statst2/statst2.c
diff --git a/rosapps/tests/statst2/statst2.rbuild b/rostests/tests/statst2/statst2.rbuild
similarity index 100%
rename from rosapps/tests/statst2/statst2.rbuild
rename to rostests/tests/statst2/statst2.rbuild
diff --git a/rosapps/tests/stretchblt/lena.bmp b/rostests/tests/stretchblt/lena.bmp
similarity index 100%
rename from rosapps/tests/stretchblt/lena.bmp
rename to rostests/tests/stretchblt/lena.bmp
diff --git a/rosapps/tests/stretchblt/stretchblt.cpp b/rostests/tests/stretchblt/stretchblt.cpp
similarity index 100%
rename from rosapps/tests/stretchblt/stretchblt.cpp
rename to rostests/tests/stretchblt/stretchblt.cpp
diff --git a/rosapps/tests/stretchblt/stretchblt.rbuild b/rostests/tests/stretchblt/stretchblt.rbuild
similarity index 100%
rename from rosapps/tests/stretchblt/stretchblt.rbuild
rename to rostests/tests/stretchblt/stretchblt.rbuild
diff --git a/rosapps/tests/subclass/subclass.c b/rostests/tests/subclass/subclass.c
similarity index 100%
rename from rosapps/tests/subclass/subclass.c
rename to rostests/tests/subclass/subclass.c
diff --git a/rosapps/tests/subclass/subclass.rbuild b/rostests/tests/subclass/subclass.rbuild
similarity index 100%
rename from rosapps/tests/subclass/subclass.rbuild
rename to rostests/tests/subclass/subclass.rbuild
diff --git a/rosapps/tests/suspend/suspend.c b/rostests/tests/suspend/suspend.c
similarity index 100%
rename from rosapps/tests/suspend/suspend.c
rename to rostests/tests/suspend/suspend.c
diff --git a/rosapps/tests/suspend/suspend.rbuild b/rostests/tests/suspend/suspend.rbuild
similarity index 100%
rename from rosapps/tests/suspend/suspend.rbuild
rename to rostests/tests/suspend/suspend.rbuild
diff --git a/rosapps/tests/tcpsvr/tcpsvr.c b/rostests/tests/tcpsvr/tcpsvr.c
similarity index 100%
rename from rosapps/tests/tcpsvr/tcpsvr.c
rename to rostests/tests/tcpsvr/tcpsvr.c
diff --git a/rosapps/tests/tcpsvr/tcpsvr.rbuild b/rostests/tests/tcpsvr/tcpsvr.rbuild
similarity index 100%
rename from rosapps/tests/tcpsvr/tcpsvr.rbuild
rename to rostests/tests/tcpsvr/tcpsvr.rbuild
diff --git a/rosapps/tests/terminate/terminate.c b/rostests/tests/terminate/terminate.c
similarity index 100%
rename from rosapps/tests/terminate/terminate.c
rename to rostests/tests/terminate/terminate.c
diff --git a/rosapps/tests/terminate/terminate.rbuild b/rostests/tests/terminate/terminate.rbuild
similarity index 100%
rename from rosapps/tests/terminate/terminate.rbuild
rename to rostests/tests/terminate/terminate.rbuild
diff --git a/rosapps/tests/thread/thread.c b/rostests/tests/thread/thread.c
similarity index 100%
rename from rosapps/tests/thread/thread.c
rename to rostests/tests/thread/thread.c
diff --git a/rosapps/tests/thread/thread.rbuild b/rostests/tests/thread/thread.rbuild
similarity index 100%
rename from rosapps/tests/thread/thread.rbuild
rename to rostests/tests/thread/thread.rbuild
diff --git a/rosapps/tests/thread_msg/thread_msg.c b/rostests/tests/thread_msg/thread_msg.c
similarity index 100%
rename from rosapps/tests/thread_msg/thread_msg.c
rename to rostests/tests/thread_msg/thread_msg.c
diff --git a/rosapps/tests/thread_msg/thread_msg.rbuild b/rostests/tests/thread_msg/thread_msg.rbuild
similarity index 100%
rename from rosapps/tests/thread_msg/thread_msg.rbuild
rename to rostests/tests/thread_msg/thread_msg.rbuild
diff --git a/rosapps/tests/threadwait/threadwait.c b/rostests/tests/threadwait/threadwait.c
similarity index 100%
rename from rosapps/tests/threadwait/threadwait.c
rename to rostests/tests/threadwait/threadwait.c
diff --git a/rosapps/tests/threadwait/threadwait.rbuild b/rostests/tests/threadwait/threadwait.rbuild
similarity index 100%
rename from rosapps/tests/threadwait/threadwait.rbuild
rename to rostests/tests/threadwait/threadwait.rbuild
diff --git a/rosapps/tests/tmrqueue/tmrqueue.c b/rostests/tests/tmrqueue/tmrqueue.c
similarity index 100%
rename from rosapps/tests/tmrqueue/tmrqueue.c
rename to rostests/tests/tmrqueue/tmrqueue.c
diff --git a/rosapps/tests/tmrqueue/tmrqueue.rbuild b/rostests/tests/tmrqueue/tmrqueue.rbuild
similarity index 100%
rename from rosapps/tests/tmrqueue/tmrqueue.rbuild
rename to rostests/tests/tmrqueue/tmrqueue.rbuild
diff --git a/rosapps/tests/tokentest/tokentest.c b/rostests/tests/tokentest/tokentest.c
similarity index 100%
rename from rosapps/tests/tokentest/tokentest.c
rename to rostests/tests/tokentest/tokentest.c
diff --git a/rosapps/tests/tokentest/tokentest.rbuild b/rostests/tests/tokentest/tokentest.rbuild
similarity index 100%
rename from rosapps/tests/tokentest/tokentest.rbuild
rename to rostests/tests/tokentest/tokentest.rbuild
diff --git a/rosapps/tests/txtscale/mk_font.cpp b/rostests/tests/txtscale/mk_font.cpp
similarity index 100%
rename from rosapps/tests/txtscale/mk_font.cpp
rename to rostests/tests/txtscale/mk_font.cpp
diff --git a/rosapps/tests/txtscale/mk_font.h b/rostests/tests/txtscale/mk_font.h
similarity index 100%
rename from rosapps/tests/txtscale/mk_font.h
rename to rostests/tests/txtscale/mk_font.h
diff --git a/rosapps/tests/txtscale/txtscale.cpp b/rostests/tests/txtscale/txtscale.cpp
similarity index 100%
rename from rosapps/tests/txtscale/txtscale.cpp
rename to rostests/tests/txtscale/txtscale.cpp
diff --git a/rosapps/tests/txtscale/txtscale.rbuild b/rostests/tests/txtscale/txtscale.rbuild
similarity index 100%
rename from rosapps/tests/txtscale/txtscale.rbuild
rename to rostests/tests/txtscale/txtscale.rbuild
diff --git a/rosapps/tests/vmtest/vmtest.c b/rostests/tests/vmtest/vmtest.c
similarity index 100%
rename from rosapps/tests/vmtest/vmtest.c
rename to rostests/tests/vmtest/vmtest.c
diff --git a/rosapps/tests/vmtest/vmtest.rbuild b/rostests/tests/vmtest/vmtest.rbuild
similarity index 100%
rename from rosapps/tests/vmtest/vmtest.rbuild
rename to rostests/tests/vmtest/vmtest.rbuild
diff --git a/rosapps/tests/wclickat/wclickat.c b/rostests/tests/wclickat/wclickat.c
similarity index 100%
rename from rosapps/tests/wclickat/wclickat.c
rename to rostests/tests/wclickat/wclickat.c
diff --git a/rosapps/tests/wclickat/wclickat.rbuild b/rostests/tests/wclickat/wclickat.rbuild
similarity index 100%
rename from rosapps/tests/wclickat/wclickat.rbuild
rename to rostests/tests/wclickat/wclickat.rbuild
diff --git a/rosapps/tests/winhello/winhello.c b/rostests/tests/winhello/winhello.c
similarity index 100%
rename from rosapps/tests/winhello/winhello.c
rename to rostests/tests/winhello/winhello.c
diff --git a/rosapps/tests/winhello/winhello.rbuild b/rostests/tests/winhello/winhello.rbuild
similarity index 100%
rename from rosapps/tests/winhello/winhello.rbuild
rename to rostests/tests/winhello/winhello.rbuild
diff --git a/rosapps/tests/wm_erasebkgnd/BACKBITMAP.BMP b/rostests/tests/wm_erasebkgnd/BACKBITMAP.BMP
similarity index 100%
rename from rosapps/tests/wm_erasebkgnd/BACKBITMAP.BMP
rename to rostests/tests/wm_erasebkgnd/BACKBITMAP.BMP
diff --git a/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.cpp b/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.cpp
similarity index 100%
rename from rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.cpp
rename to rostests/tests/wm_erasebkgnd/wm_erasebkgnd.cpp
diff --git a/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild b/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
similarity index 100%
rename from rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
rename to rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
diff --git a/rosapps/tests/wm_paint/wm_paint.c b/rostests/tests/wm_paint/wm_paint.c
similarity index 100%
rename from rosapps/tests/wm_paint/wm_paint.c
rename to rostests/tests/wm_paint/wm_paint.c
diff --git a/rosapps/tests/wm_paint/wm_paint.rbuild b/rostests/tests/wm_paint/wm_paint.rbuild
similarity index 100%
rename from rosapps/tests/wm_paint/wm_paint.rbuild
rename to rostests/tests/wm_paint/wm_paint.rbuild
diff --git a/rosapps/tests/wpickclick/wpickclick.c b/rostests/tests/wpickclick/wpickclick.c
similarity index 100%
rename from rosapps/tests/wpickclick/wpickclick.c
rename to rostests/tests/wpickclick/wpickclick.c
diff --git a/rosapps/tests/wpickclick/wpickclick.rbuild b/rostests/tests/wpickclick/wpickclick.rbuild
similarity index 100%
rename from rosapps/tests/wpickclick/wpickclick.rbuild
rename to rostests/tests/wpickclick/wpickclick.rbuild
diff --git a/rosapps/tests/zwcontinue/i386/zwcontinue.asm b/rostests/tests/zwcontinue/i386/zwcontinue.asm
similarity index 100%
rename from rosapps/tests/zwcontinue/i386/zwcontinue.asm
rename to rostests/tests/zwcontinue/i386/zwcontinue.asm
diff --git a/rosapps/tests/zwcontinue/zwcontinue.c b/rostests/tests/zwcontinue/zwcontinue.c
similarity index 100%
rename from rosapps/tests/zwcontinue/zwcontinue.c
rename to rostests/tests/zwcontinue/zwcontinue.c
diff --git a/rosapps/tests/zwcontinue/zwcontinue.rbuild b/rostests/tests/zwcontinue/zwcontinue.rbuild
similarity index 100%
rename from rosapps/tests/zwcontinue/zwcontinue.rbuild
rename to rostests/tests/zwcontinue/zwcontinue.rbuild