moved test files to relevant directories

Note: Removed XLayout.java which didn't seem to serve any purpose