Code Restructuring

Moved code to src/