reorder folders
fix Intellij Idea project data
Add the custom lib names for Idea again
Merge remote-tracking branch 'origin/master'