Updated File Structure

Updated file structure, cleaned code, renamed files, got database
working correctly