Code layout
Clean requirements file