URI problem fixed
added project files
Code clean-up is done
uri bug fixed during installation
reverted wrong changes
minor cleanup;