Features and File Cleanup

Signed-off-by: King Sidharth <king@kingsidharth.com>