Major work
Shit
Change file structure to comply with Maven standards
More work
Merge branch 'feature/multithread' into develop