Restructure folders, update to happytails main file