updated build files, project reorganized
fixed bug