simplified folder structure, updated readme