Remove source folder. First implement layout