Re-configured Interfaces and Cleaned up a bit
Renamed Files