Cleaned up file structure a bit