reorganize project
start fixing tests
fix template