2.1

better folder/files srtructure