fixed file structure + minor changes