Working Update

Change on files and directory structure.