Refactoring of project structure and remove skeleton

Change package structure to be more cleaner. Remove unnecessary skeleton
implementation. This changes make code more readable.