Code cleanup

- renaming files and directories for better consistency
- cleanup of @Almad's testsuite draft
- fixes failing test(s) in TravisCI