Exclude bin directory
Restructure