Removed Basic Files / Some Refactoring

Advanced Files Refactored.