Moved to the correct places. Removed unnecessary dependencies.