Simplify project structure + Use master layout