[WIP] Refactor to bundle

Refactor this project as a bundle so it will be easier to maintains add deploy