Reorganize project

Look and merge! :)