Folder Restructure, Database Class Added
Further Restructuring