Cleaned up indentation and restructured files