Reorder files structure. Adjust to Idea