Further improvements on project structure.
Improved project structure and added some basic method implementations.