New File Structure

Cleaned up the file structure...