Changed organization of folders
Almost solved problem 2. Memory issues