New file structure and readme update