Updated File Structure

- Organized file structure