Add makefile for deploy + move stuff in the appropriate folders