file org impove and code clean up

move files and cleanup code