fixed file structure, updated features