added folders
Cleaned up the interface