Trivial

Reorganizing files and updating build paths
Trivial