Clean-up in project structure, added code comments.