Cleaned up structure, added composer