Refactored the directory structure
Minor additional changes