reorganization of folder structure (didn't work on windows) - main still
not in src/, todo? (AH)