Added unit tests; this changes the directory structure