Changed directory structure, started work on tests