Another layout restruture (for easier Composer compatability)
Adding placeholder for test directories