Cleaned up & organized to folders