Removed files + Organized system