Structured code and added more files