Changed file structure and did some updates