Cleaned Structure

File structure updated.