Done adjusting file locations.
Added module folders for each component.