Basic unit testing added and project structure cleaned