tests are passing, except the birtdate (temporary disable)
Moved around some directories to keep a clean file structure without folders required for testing getting in the way