First Commit

Cleaned up folder struct