Cleaned up folders / renamed files