rearranged modules code

Moved modules into site and admin files as we have cant keep in same
place due to admin modules having same name as site module